Welcome Afterburn. Enjoyed reading your well constructed summary.
My simple Q & A for J.W.'s regarding baptism is this:
Q. Scripturally, what requirements are necessary for a baptismal candidate?
A. Acts 2:38; 3:19 - Peter said to them: “Repent, and let each one of you be baptized in the name of Jesus Christ for forgiveness of your sins, . . .
“Repent, therefore, and turn around so as to get your sins blotted out, . . .
Repentance has absolutely nothing to do with the J.W. dogma of "dedication."